Merge tag 'upstream/1.7.2'
authorLeopold Palomo-Avellaneda <leo@alaxarxa.net>
Mon, 6 Oct 2014 07:24:53 +0000 (09:24 +0200)
committerLeopold Palomo-Avellaneda <leo@alaxarxa.net>
Mon, 6 Oct 2014 07:24:53 +0000 (09:24 +0200)
Upstream version 1.7.2


Trivial merge